From 2a3d5739ed0c5117bdda67c47a21eab41b72d52d Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Thu, 25 Oct 2001 15:17:57 +0000 Subject: [PATCH] remove conflict mark --- ChangeLog | 1 - ChangeLog.pre-2-0 | 1 - ChangeLog.pre-2-10 | 1 - ChangeLog.pre-2-2 | 1 - ChangeLog.pre-2-4 | 1 - ChangeLog.pre-2-6 | 1 - ChangeLog.pre-2-8 | 1 - 7 files changed, 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee5091dab..e7308c6463 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld remove hack to strip off the bogus newline, since we killed the bogus newline; fixes #61779 ->>>>>>> 1.2451 2001-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bee5091dab..e7308c6463 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld remove hack to strip off the bogus newline, since we killed the bogus newline; fixes #61779 ->>>>>>> 1.2451 2001-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bee5091dab..e7308c6463 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld remove hack to strip off the bogus newline, since we killed the bogus newline; fixes #61779 ->>>>>>> 1.2451 2001-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bee5091dab..e7308c6463 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld remove hack to strip off the bogus newline, since we killed the bogus newline; fixes #61779 ->>>>>>> 1.2451 2001-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bee5091dab..e7308c6463 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld remove hack to strip off the bogus newline, since we killed the bogus newline; fixes #61779 ->>>>>>> 1.2451 2001-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bee5091dab..e7308c6463 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld remove hack to strip off the bogus newline, since we killed the bogus newline; fixes #61779 ->>>>>>> 1.2451 2001-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bee5091dab..e7308c6463 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -56,7 +56,6 @@ Wed Oct 24 20:29:47 2001 Kristian Rietveld remove hack to strip off the bogus newline, since we killed the bogus newline; fixes #61779 ->>>>>>> 1.2451 2001-10-24 Havoc Pennington * gtk/gtktextview.c (gtk_text_view_update_adjustments): don't -- 2.30.2